From: Bill Wohler <wohler@newt.com>
Date: Sun, 25 Nov 2012 18:33:16 +0000 (-0800)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~13
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a09777fb290dfd273a66a845e75b208f23262f06;p=emacs.git

Merge from trunk.
---

a09777fb290dfd273a66a845e75b208f23262f06